From 859cafbbf917a1e3d3369d56403952b7dfe445b7 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Sat, 17 May 2025 12:50:28 -0700 Subject: [PATCH] [PATCH] kopper: Revert "kopper: Explicitly choose zink" This reverts commit 854bc2ee05f90e426f318352682144050e402d4b. Forcing zink explicitly would get zink-on-lvp picked up over llvmpipe for gbm dri support, which is not intended. Currently, zink_screen's choose_pdev won't be able to reject it when the driver name is explicit. So we have to revert the change first to mitigate regressions. Reported-by: @n3rdopolis @0xnihilo Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13053 Fixes: 854bc2ee05f ("kopper: Explicitly choose zink") Acked-by: Mike Blumenkrantz Part-of: (cherry picked from commit e6481d3f42e0cd735fda38fb3029e6f8abf5a0e6) Gbp-Pq: Name kopper-Revert-kopper-Explicitly-choose-zink.patch --- src/gallium/frontends/dri/kopper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index a1d7dcb79..3bdb56022 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -73,7 +73,7 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred) bool success; #ifdef HAVE_LIBDRM if (screen->fd != -1) - success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true); + success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false); else success = pipe_loader_vk_probe_dri(&screen->dev); #else -- 2.30.2